From 3803ac66099d72eded0016b080c9ee74d2553416 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 9 Jul 2010 12:21:31 +0100 Subject: [PATCH] mce: Replace BUG() with a console warning in the MCE handler. If the hardware reports corrected errors that we didn't see through the status MSRs, complain on the console but don't BUG() the machine. Signed-off-by: Tim Deegan --- xen/arch/x86/cpu/mcheck/amd_nonfatal.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c index d0eb69c39e..4815253639 100644 --- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c +++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c @@ -152,14 +152,19 @@ static void mce_amd_work_fn(void *data) /* HW does not count *all* kinds of correctable errors. * Thus it is possible, that the polling routine finds an - * correctable error even if the HW reports nothing. - * However, the other way around is not possible (= BUG). - */ + * correctable error even if the HW reports nothing. */ if (counter > 0) { /* HW reported correctable errors, * the polling routine did not find... */ - BUG_ON(adjust == 0); + if (adjust == 0) { + printk("CPU counter reports %"PRIu32 + " correctable hardware error%s that %s" + " not reported by the status MSRs\n", + counter, + (counter == 1 ? "" : "s"), + (counter == 1 ? "was" : "were")); + } /* subtract 1 to not double count the error * from the polling service routine */ adjust += (counter - 1); -- 2.30.2